Skip to content

Conversation

@wu-clan
Copy link
Member

@wu-clan wu-clan commented Sep 19, 2025

No description provided.

# Conflicts:
#	backend/app/admin/model/dept.py
#	backend/app/admin/model/m2m.py
#	backend/app/admin/model/menu.py
#	backend/app/admin/model/opera_log.py
#	backend/app/admin/model/role.py
#	backend/app/admin/model/user.py
#	backend/app/task/model/scheduler.py
#	backend/plugin/code_generator/model/business.py
#	backend/plugin/code_generator/model/column.py
#	backend/plugin/config/model/config.py
#	backend/plugin/dict/model/dict_data.py
#	backend/plugin/dict/model/dict_type.py
#	backend/plugin/notice/model/notice.py
#	backend/plugin/oauth2/model/user_social.py
#	docker-compose.yml
@wu-clan wu-clan marked this pull request as ready for review October 17, 2025 09:01
@wu-clan wu-clan merged commit b28a4d7 into master Oct 17, 2025
5 checks passed
@wu-clan wu-clan deleted the pg-main branch October 17, 2025 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants